styleproperty: Remove base argument

from _gtk_style_property_parse_value(). The GtkCssParser takes care of
that now.

diff --git a/gtk/gtkcsscustomproperty.c b/gtk/gtkcsscustomproperty.c
index 9c0cb81e0c1f11a4e5e003a5acbb13d4a2c40e88..f017f7c0887fec2dc994ac90a3afb0b4c0f3a425 100644 (file)
--- a/gtk/gtkcsscustomproperty.c
+++ b/gtk/gtkcsscustomproperty.c
@@ -42,8 +42,7 @@ gtk_css_custom_property_get_specified_type (GParamSpec *pspec)
 
 static GtkCssValue *
 gtk_css_custom_property_parse_value (GtkStyleProperty *property,
-                                     GtkCssParser     *parser,
-                                     GFile            *base)
+                                     GtkCssParser     *parser)
 {
   GtkCssCustomProperty *custom = GTK_CSS_CUSTOM_PROPERTY (property);
   GValue value = G_VALUE_INIT;

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 05422d66ad3f6f03f63c7ea5a7085cd9e60216ee..d57ccd062bb692de9e0d83e0ffa7e6c14a10bfca 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2200,8 +2200,7 @@ parse_declaration (GtkCssScanner *scanner,
       gtk_css_scanner_push_section (scanner, GTK_CSS_SECTION_VALUE);
 
       value = _gtk_style_property_parse_value (property,
-                                               scanner->parser,
-                                               gtk_css_scanner_get_base_url (scanner));
+                                               scanner->parser);
 
       if (value == NULL)
         {

diff --git a/gtk/gtkcssshorthandproperty.c b/gtk/gtkcssshorthandproperty.c
index 96e8c63463e81bb51f865cf088a9dc01545716ca..c6ca6146890cae4c12db2c4dab906d319805657a 100644 (file)
--- a/gtk/gtkcssshorthandproperty.c
+++ b/gtk/gtkcssshorthandproperty.c
@@ -86,8 +86,7 @@ _gtk_css_shorthand_property_query (GtkStyleProperty   *property,
 
 static GtkCssValue *
 gtk_css_shorthand_property_parse_value (GtkStyleProperty *property,
-                                        GtkCssParser     *parser,
-                                        GFile            *base)
+                                        GtkCssParser     *parser)
 {
   GtkCssShorthandProperty *shorthand = GTK_CSS_SHORTHAND_PROPERTY (property);
   GtkCssValue **data;

diff --git a/gtk/gtkcssstyleproperty.c b/gtk/gtkcssstyleproperty.c
index 8a34bdc8e97b37690f69ba0cb4fb242393db8e60..cc08e188f82d01479f8bfb9dc90dd1fba1021ff4 100644 (file)
--- a/gtk/gtkcssstyleproperty.c
+++ b/gtk/gtkcssstyleproperty.c
@@ -147,8 +147,7 @@ _gtk_css_style_property_query (GtkStyleProperty   *property,
 
 static GtkCssValue *
 gtk_css_style_property_parse_value (GtkStyleProperty *property,
-                                    GtkCssParser     *parser,
-                                    GFile            *base)
+                                    GtkCssParser     *parser)
 {
   GtkCssStyleProperty *style_property = GTK_CSS_STYLE_PROPERTY (property);
 

diff --git a/gtk/gtkstyleproperty.c b/gtk/gtkstyleproperty.c
index 87234e043a96c284bfcccbbc8d111439e4e88714..74245d6ce2b59bbcdeee637bed9822123643a8b6 100644 (file)
--- a/gtk/gtkstyleproperty.c
+++ b/gtk/gtkstyleproperty.c
@@ -132,7 +132,6 @@ _gtk_style_property_init (GtkStyleProperty *property)
  * _gtk_style_property_parse_value:
  * @property: the property
  * @parser: the parser to parse from
- * @base: the base file for @aprser
  *
  * Tries to parse the given @property from the given @parser into
  * @value. The type that @value will be assigned is dependant on
@@ -148,8 +147,7 @@ _gtk_style_property_init (GtkStyleProperty *property)
  **/
 GtkCssValue *
 _gtk_style_property_parse_value (GtkStyleProperty *property,
-                                 GtkCssParser     *parser,
-                                 GFile            *base)
+                                 GtkCssParser     *parser)
 {
   GtkStylePropertyClass *klass;
 
@@ -158,7 +156,7 @@ _gtk_style_property_parse_value (GtkStyleProperty *property,
 
   klass = GTK_STYLE_PROPERTY_GET_CLASS (property);
 
-  return klass->parse_value (property, parser, base);
+  return klass->parse_value (property, parser);
 }
 
 /**

diff --git a/gtk/gtkstylepropertyprivate.h b/gtk/gtkstylepropertyprivate.h
index 56fb82be584ecac9f2bd19defb68297f7abf32cb..a92afdc36a0783ce57968cdc0f5f7e17c2f3bb93 100644 (file)
--- a/gtk/gtkstylepropertyprivate.h
+++ b/gtk/gtkstylepropertyprivate.h
@@ -58,8 +58,7 @@ struct _GtkStylePropertyClass
                                                             GtkStyleQueryFunc       query_func,
                                                             gpointer                query_data);
   GtkCssValue *     (* parse_value)                        (GtkStyleProperty *      property,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkCssParser           *parser);
 
   GHashTable   *properties;
 };
@@ -73,8 +72,7 @@ GtkStyleProperty *       _gtk_style_property_lookup        (const char
 const char *             _gtk_style_property_get_name      (GtkStyleProperty       *property);
 
 GtkCssValue *            _gtk_style_property_parse_value   (GtkStyleProperty *      property,
-                                                            GtkCssParser           *parser,
-                                                            GFile                  *base);
+                                                            GtkCssParser           *parser);
 
 GType                    _gtk_style_property_get_value_type(GtkStyleProperty *      property);
 void                     _gtk_style_property_query         (GtkStyleProperty *      property,